Don't popup the completions if the focus has already been moved somewhere

2005-11-07  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkentrycompletion.c (_gtk_entry_completion_popup):
	Don't popup the completions if the focus has already been
	moved somewhere else.  (#319914, Christian Persch)

diff --git a/ChangeLog b/ChangeLog
index a82a7e8e30542fd26b0c3e40307c49a7f5d337cc..7b859bdd8510a3aee7fc63b3d1fe0ce4ca8d9087 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-11-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkentrycompletion.c (_gtk_entry_completion_popup): 
+       Don't popup the completions if the focus has already been
+       moved somewhere else.  (#319914, Christian Persch)
+
        * gtk/gtktoolitem.c (_gtk_tool_item_toolbar_reconfigured): 
        Raise the drag_window after reconfiguring the 
        toolbar.  (#320803, Christian Persch)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a82a7e8e30542fd26b0c3e40307c49a7f5d337cc..7b859bdd8510a3aee7fc63b3d1fe0ce4ca8d9087 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
 2005-11-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkentrycompletion.c (_gtk_entry_completion_popup): 
+       Don't popup the completions if the focus has already been
+       moved somewhere else.  (#319914, Christian Persch)
+
        * gtk/gtktoolitem.c (_gtk_tool_item_toolbar_reconfigured): 
        Raise the drag_window after reconfiguring the 
        toolbar.  (#320803, Christian Persch)

diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index b5974698d058a6e42749ce6c6e6fdbbbcf0cc3ad..73505c8153700ace7f65c34ce5e3b66961e039ff 100644 (file)
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -1425,6 +1425,9 @@ _gtk_entry_completion_popup (GtkEntryCompletion *completion)
   if (!GTK_WIDGET_MAPPED (completion->priv->entry))
     return;
 
+  if (!GTK_WIDGET_HAS_FOCUS (completion->priv->entry))
+    return;
+
   completion->priv->ignore_enter = TRUE;
     
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (completion->priv->action_view), 0);